Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

3rd Party Victory Music (WY, UPP, CLF, USCM) #3861

Merged
merged 16 commits into from
Jul 25, 2023

Conversation

blackdragonTOW
Copy link
Contributor

@blackdragonTOW blackdragonTOW commented Jul 11, 2023

About the pull request

This adds a "Last Man Standing" condition, where in the event of a Xeno Minor where all Xenos are dead but humans are still in control of the ship, we figure out which faction controls the Almayer and play thematic music for that faction. Currently whichever faction has more than 50% of the Last Troops Standing, is considered the "winner". Additionally the Colonial Marines theme song is now officially the USCM hijack comeback song.

Melancholy1 is the fallback in the case that there is no determined majority.

This adds:

  • Weyland-Yutani
  • UPP
  • CLF
  • USCM (technically)

Note: This only alters what music plays during a Xeno Minor. The round outcome still counts as a Xeno win both mechanically and statistically.

Explain why it's good for the game

In the rare event of a botched xeno hijack, it'd be cool to do something special if a 3rd party manages to secure a USCM Warship.

Testing Photographs and Procedure

The headcount proc was tested against ERT members making sure that faction count was accurate.
The music selector was tested by forcing round_status to Xeno_Minor and verifying that we toggle between whomever is the majority.

Screenshots & Videos

Put screenshots and videos here with an empty line between the screenshots and the <details> tags.

Changelog

🆑
add: Added unique, faction dependent music to Round End in the event that Xenos lose post hijack.
/:cl:

@github-actions github-actions bot added Sound Blast 5 minutes of bass boosted music to our players Feature Feature coder badge labels Jul 11, 2023
normalized to -8db
@blackdragonTOW
Copy link
Contributor Author

Forgot to normalize the new files to -8db, special shoutout to Thwomp for saving countless eardrums. Reuploaded new oggs.

Copy link
Contributor

@Ben10083 Ben10083 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Some of my thoughts on the code. Overall, I really like the concept.

code/game/gamemodes/colonialmarines/colonialmarines.dm Outdated Show resolved Hide resolved
code/game/gamemodes/colonialmarines/colonialmarines.dm Outdated Show resolved Hide resolved
@MusselMain
Copy link

noice, now the other major factions have music for if any HVH events occur

sound/theme/LastManStanding_CLF.ogg Outdated Show resolved Hide resolved
@harryob harryob marked this pull request as draft July 14, 2023 10:17
@blackdragonTOW blackdragonTOW marked this pull request as ready for review July 14, 2023 16:07
@Troontjelolo
Copy link

The WY one is great. The CLF and UPP ones could have better songs, though. My main issue with the UPP is that it's maybe a bit too much? Don't get me wrong, the Sacred War is a Real Soviet Classic (tm) but it doesn't feel quite right; A little too high energy if you feel me. Personally I believe this song might fit better:

https://www.youtube.com/watch?v=ymtd9mdBRzM

@github-actions
Copy link
Contributor

This PR has been inactive for long enough to be automatically marked as stale. This means it is at risk of being auto closed in ~ 7 days, please address any outstanding review items and ensure your PR is finished, if these are all true and you are auto-staled anyway, you need to actively ask maintainers if your PR will be merged. Once you have done any of the previous actions then you should request a maintainer remove the stale label on your PR, to reset the stale timer. If you feel no maintainer will respond in that time, you may wish to close this PR youself, while you seek maintainer comment, as you will then be able to reopen the PR yourself

@github-actions github-actions bot added the Stale beg a maintainer to review your PR label Jul 22, 2023
num_headcount++
continue
num_headcount++
return list(num_marines,num_WY,num_UPP,num_CLF,num_headcount)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

make this an associated list so we're not accessing by index later

if(living_player_list[1] && !living_player_list[2]) // If Xeno Minor but Xenos are dead and Humans are alive, see which faction is the last standing
var/headcount = count_per_faction()
var/living = headcount[5]
if ((headcount[2] / living) > MAJORITY) // headcount[2] = Weyland-Yutani
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

see above about accessing by index

@harryob harryob marked this pull request as draft July 24, 2023 22:02
@harryob harryob removed the Stale beg a maintainer to review your PR label Jul 24, 2023
@blackdragonTOW blackdragonTOW marked this pull request as ready for review July 24, 2023 23:10
@blackdragonTOW
Copy link
Contributor Author

Made the headcount tally and associative list!

code/game/gamemodes/cm_process.dm Outdated Show resolved Hide resolved
@harryob harryob enabled auto-merge July 24, 2023 23:15
@harryob harryob added this pull request to the merge queue Jul 24, 2023
Merged via the queue into cmss13-devs:master with commit 0e93e1d Jul 25, 2023
@github-actions
Copy link
Contributor

Your Fix/Feature pull request is currently below zero (-4). Maintainers may close future Feature/Balance PRs. Fixing issues or helping to improve the codebase will raise this score.

github-actions bot added a commit that referenced this pull request Jul 25, 2023
cm13-github added a commit that referenced this pull request Jul 25, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Feature Feature coder badge Sound Blast 5 minutes of bass boosted music to our players
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants